Small warning cleanups.

Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
        gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.

        * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
        the function definition so we don't accidentally rely on
        the compat #define from gtk_radio_menu_item_group.
        (#60782, Jeff Franks)

diff --git a/ChangeLog b/ChangeLog
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d336921614f1b66ee1a68ac014da337567d73baa..a00c469fdab56bd8d751a6aef65a657c10b1cfc6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Thu Sep 20 11:03:51 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkobject.c gtk/gtklist.c gtk/gtkplug.c gtk/gtksocket.c
+       gtk/gtktreemodelsort.c gtk/gtktreeview.c: Small warning cleanups.
+
+       * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_get_group): Change
+       the function definition so we don't accidentally rely on
+       the compat #define from gtk_radio_menu_item_group.
+       (#60782, Jeff Franks)
+
 Thu Sep 20 16:51:02 2001  Kristian Rietveld  <kristian@planet.nl>
 
         * gtk/gtkwindow.c (gtk_window_get_frame_dimensions): returned

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index bc96424eff10973846830da192318630b767ed92..52e7f89334192cad1991625347a1ab088212eac2 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -1446,7 +1446,6 @@ void
 gtk_list_select_all (GtkList *list)
 {
   GtkContainer *container;
-  GList *work;
  
   g_return_if_fail (GTK_IS_LIST (list));
 

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index a3f7e75718f48a7d0763dc425c906ec2373db12c..a5c445384b9cbd8fe9ce9f84ec5c2dd318393d57 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -563,7 +563,7 @@ gtk_object_new (GtkType      object_type,
   g_return_val_if_fail (GTK_TYPE_IS_OBJECT (object_type), NULL);
 
   va_start (var_args, first_property_name);
-  object = g_object_new_valist (object_type, first_property_name, var_args);
+  object = (GtkObject *)g_object_new_valist (object_type, first_property_name, var_args);
   va_end (var_args);
 
   return object;

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 2ebbb784cecf1522347110a9db41bd66d3d840fe..736a047a05c8aa7d26c7b06f277e448a7e62e7f3 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -54,7 +54,9 @@ static void            gtk_plug_set_focus             (GtkWindow        *window,
 static gboolean        gtk_plug_focus                 (GtkWidget        *widget,
                                                       GtkDirectionType  direction);
 static void            gtk_plug_check_resize          (GtkContainer     *container);
+#if 0
 static void            gtk_plug_accel_entries_changed (GtkWindow        *window);
+#endif
 static GdkFilterReturn gtk_plug_filter_func           (GdkXEvent        *gdk_xevent,
                                                       GdkEvent         *event,
                                                       gpointer          data);

diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 410c7cac5a06432ec667d3689eb7dcbe2279b001..62acc85586d2da76a823a606e2f5b24fd0eabfe9 100644 (file)
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -169,7 +169,7 @@ gtk_radio_menu_item_new_with_mnemonic (GSList *group,
 }
 
 GSList*
-gtk_radio_menu_item_group (GtkRadioMenuItem *radio_menu_item)
+gtk_radio_menu_item_get_group (GtkRadioMenuItem *radio_menu_item)
 {
   g_return_val_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item), NULL);
 

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 12356b5d368432af7d8309af54003ad396730e29..205aed7144fbee1cc1fb7c3b2eabd08233a5335b 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -1445,9 +1445,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
            if (socket->plug_window)
              {
                GTK_NOTE(PLUGSOCKET,
-                        g_message ("GtkSocket - window reparented",
-                                   socket->request_width,
-                                   socket->request_height));
+                        g_message ("GtkSocket - window reparented"));
              }
            
            return_val = GDK_FILTER_REMOVE;

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 32273660ae8993e1383f27d725cfccf7b5a2e411..db977e7d05e8e18f545bccf7a8ab0ba3ad06d80f 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1549,7 +1549,6 @@ gtk_tree_model_sort_sort_helper (GtkTreeModelSort *tree_model_sort,
     {
       SortElt *elt1;
       SortElt *elt2;
-      SortElt  tmp;
       gint j;
       GArray *c;
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 56898b37ef6ec577c457b432f87fba8908b991b8..5e5413af8122cc6729ebff1099e85c1d44668ab0 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -286,8 +286,6 @@ static void     gtk_tree_view_get_arrow_xrange               (GtkTreeView
 static gint     gtk_tree_view_new_column_width               (GtkTreeView       *tree_view,
                                                              gint               i,
                                                              gint              *x);
-static void     gtk_tree_view_ensure_scroll_timeout          (GtkTreeView       *tree_view,
-                                                             GFunc              func);
 static void     gtk_tree_view_adjustment_changed             (GtkAdjustment     *adjustment,
                                                              GtkTreeView       *tree_view);
 static gint     gtk_tree_view_insert_iter_height             (GtkTreeView       *tree_view,
@@ -3573,8 +3571,6 @@ gtk_tree_view_drag_motion (GtkWidget        *widget,
   if (!set_destination_row (tree_view, context, x, y, &suggested_action, &target))
     return FALSE;
 
-  /*  gtk_tree_view_ensure_scroll_timeout (tree_view); */
-
   gtk_tree_view_get_drag_dest_row (tree_view, &path, &pos);
 
   if (path == NULL)